From d061f38609a2b1581d46668b3b67934555f980fa Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Mon, 23 Oct 2023 17:12:20 +0200 Subject: [PATCH] Switch build system to cmake --- debian/control | 20 ++++++++++---------- debian/gpsbabel-doc.docs | 4 ++-- debian/gpsbabel-gui.install | 2 +- debian/gpsbabel.install | 2 +- debian/rules | 18 +++++++++--------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/debian/control b/debian/control index 744493fe4..6694420a6 100644 --- a/debian/control +++ b/debian/control @@ -4,22 +4,22 @@ Priority: optional Maintainer: Debian GPS team Uploaders: Bernd Zeimetz , Jochen Sprickerhof Build-Depends: debhelper-compat (= 13), - qt5-qmake, - pkg-config, + cmake, + pkgconf, libexpat1-dev, expat, libxml2-utils, libusb-1.0-0-dev, zlib1g-dev, libshp-dev, - qtbase5-dev, - qtwebengine5-dev [amd64 arm64 armhf i386 mips64el], - qttools5-dev-tools, - libqt5serialport5-dev, - qttranslations5-l10n, + qt6-5compat-dev, + qt6-base-dev, + qt6-serialport-dev, + qt6-tools-dev, + qt6-translations-l10n, + qt6-webengine-dev [amd64 arm64 armhf i386], imagemagick, - locales-all, xsltproc, docbook-xsl -Build-Depends-Indep: fop, docbook-xml, libpaper-dev +Build-Depends-Indep: fop, docbook-xml Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: https://www.gpsbabel.org/ @@ -70,7 +70,7 @@ Description: ${source:Synopsis} - documentation This package contains the detailed documentation of gpsbabel. Package: gpsbabel-gui -Architecture: amd64 arm64 armhf i386 mips64el +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gpsbabel (= ${binary:Version}), gpsbabel-doc (= ${source:Version}) Recommends: qttranslations5-l10n Description: ${source:Synopsis} - GUI diff --git a/debian/gpsbabel-doc.docs b/debian/gpsbabel-doc.docs index cd1b4a5a4..627bd53c2 100644 --- a/debian/gpsbabel-doc.docs +++ b/debian/gpsbabel-doc.docs @@ -1,2 +1,2 @@ -html/ -gpsbabel.pdf +obj-${DEB_HOST_GNU_TYPE}/html/ +obj-${DEB_HOST_GNU_TYPE}/gpsbabel.pdf diff --git a/debian/gpsbabel-gui.install b/debian/gpsbabel-gui.install index c093b335a..5c409b202 100644 --- a/debian/gpsbabel-gui.install +++ b/debian/gpsbabel-gui.install @@ -1,3 +1,3 @@ -gui/objects/gpsbabelfe /usr/bin +obj-${DEB_HOST_GNU_TYPE}/gui/GPSBabelFE/gpsbabelfe /usr/bin debian/gpsbabel.xpm /usr/share/pixmaps gui/gpsbabel.desktop /usr/share/applications diff --git a/debian/gpsbabel.install b/debian/gpsbabel.install index b8a5e6e66..5514aa062 100644 --- a/debian/gpsbabel.install +++ b/debian/gpsbabel.install @@ -1 +1 @@ -gpsbabel usr/bin +obj-${DEB_HOST_GNU_TYPE}/gpsbabel usr/bin diff --git a/debian/rules b/debian/rules index 87aee43c5..25f058ffb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,7 @@ #!/usr/bin/make -f -export QT_SELECT := qt5 - %: - dh $@ --buildsystem=qmake + dh $@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all # tests depending on a TZ with a small offset @@ -15,14 +13,16 @@ ifneq (,$(filter $(DEB_BUILD_ARCH),i386)) CFLAGS += -ffloat-store endif +FLAGS := -DGPSBABEL_WITH_LIBUSB=pkgconfig -DGPSBABEL_WITH_SHAPELIB=pkgconfig -DGPSBABEL_WITH_ZLIB=pkgconfig +$(shell dpkg -s qt6-webengine-dev > /dev/null) +ifneq ($(.SHELLSTATUS),0) +FLAGS += -DGPSBABEL_MAPPREVIEW=OFF +endif + override_dh_auto_configure: - dh_auto_configure -- \ - WITH_LIBUSB=pkgconfig WITH_SHAPELIB=pkgconfig WITH_ZLIB=pkgconfig + dh_auto_configure -- ${FLAGS} convert -resize 32x32 gui/images/appicon.png debian/gpsbabel.xpm xsltproc --output debian/gpsbabel.1 /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl xmldoc/gpsbabel_man.xml -execute_after_dh_auto_build-arch: - if dpkg -s qtwebengine5-dev > /dev/null; then dh_auto_build -- unix-gui; fi - override_dh_auto_build-indep: - $(MAKE) gpsbabel.org + dh_auto_build -- gpsbabel.org -- 2.30.2